Merge conflicts solutioned

[RRRRHHHH_Code] / ruralHouses client / config.xml

<?xml version="1.0" encoding="UTF-8"?>
<config>
        <businessLogic local="true">
                <businessLogicNode>localhost</businessLogicNode>
                <portRMI>1099</portRMI>
                <serviceRMI>RuralHouses</serviceRMI>
        </businessLogic>
        <database local="true">

        <databaseNode>localhost</databaseNode>
        <db4oFilename>db/casas.db4o</db4oFilename>
        <dataBaseOpenMode>initialize</dataBaseOpenMode>
        <activationDepth>10</activationDepth>
        <updateDepth>10</updateDepth>
        <databasePort>8100</databasePort>
        <user>softEng</user>
        <password>i4softwEngin2matx</password>
</database>
<javaPolicyPath>java.policy</javaPolicyPath>

</config>